Style and whitespace fixes, and a FIXME