Make default checker less difficult to read

No functional changes, just cleanup.