Clean-up minor warnings across the board.
Clean up type functions in CPPCG to use EType.
Cleanup class definitions for annotation combinations.