CDI-327, use id in ATD.addAnnotatedType()