cfp: Drop unneeded annotation prefix; plural fixes.