class-name handling refactored in processing of class definitions.