Miscellaneous formatter-related cleanup