Bug 879494 followup, clean up the last few bug685516 annotations
CLOSED TREE