Minor refactoring of annotation predicates