From trunk: Another BSD compile fix