Working around broken annotation, part II