Edited comments

Originally edited during merge, but lost during subsequent rebase.