Cleaning up merge cruft.