More ClassLoader changes.
This should finally fix bug #5.