Some formatting tweaks

In particular, get rid of many empty lines, which made the code
harder to read and also could prevent git from properly detecting
merge conflicts.
Fix building documentation without 'autodoc' option
Add various FIXME comments