Improve visibility by unindenting. Also move the ifdefs _before_ the
according comments. Finally merge ifdefs to fewer blocks.