Cleaned up some merge weirdness.