Remove/move more comments on identical keys

#1583