Fix Broxygen-related compile errors.