Cleaning up after messy merge.