Formatting &c cleanups.