Create less classes.
Merge pull request #119 from jmiettinen/jarkko-9655

Create less one-off classes thus leak less memory!