General cleanup to remove cruft from merging code.