Taking care with comments in 'remove'.