Refactoring ConditionChecker API.