More cleanups for mirroring.