[REF] auto-fix conventions (and manual fixes)

I wasn't sure what to do with this particular case, but it's really not a good solution. I'll revert it.