Fixed some more char type uses.
Removed all ifdef CLASSES block due to never defined CLASSES def anyway.