Fix some merge dodginess.