Nice cleanup of the `case` statements.