change the way data desugaring and annotations work, so that annotations just call predicates as they are written, and data does not generate ?-suffixed identifiers