tweaks: preen some comments, and reshuffle a few ifdefs
3 files changed