Clean up unowned comments when merging.

Fixes #2346