Minor preparatory refactoring for returned checks.