Raft of formatting and ordering tweaks.