Fix class based replacers.
Fix conflicts.