Commit some cleanups to the format type code.