Trivial formatting rebased from #995

Just tweaks some comment and whitespace to match changes in #995 which mostly affects code not in `dev_4_4`.