WINTERMUTE: More formatting fixes.