Cleanign up some other merges I clearly missed.