Fixup on some modules for release

There may be more coming, but if not, this should cover
this week's minor style changes.