Fixes small bugs. Introduces a new class source that does a slight
optimization before providing classes.