There are a number of places that an IDE reports that enhanced switch and other minor cleanup can be done in the Checker class. There's enough to do it standalone, and not piggy-backed on any other change to this file.