Small merge cleanups