BISERVER-10435:  Ensured all applicable classes are annotated.