Cleaning up XXXes

Mostly changing them to numbered FIXMEs. Inoffensive changes, self-reviewing.