Refactor coherence.