Consistency refactor.