refactoring: change afterCheck's argument etc.