Doing the right thing for annotations