Clean up unowned comments when merging.

Closes #2346