new scoping rules for annotations, relevant to #713