Move return checks to the grammar checker.