More refactoring of CheckerImpl