Properly handle re-inserting comments