Use FORMAT everywhere, and fix up the errors it finds