Refactoring mark occurrences.