More types in ClassLoader

Also, in which I find more kludgery...