Fixing a small issue w/ classloader errors.

Now we're back on par with compatibility from before my refactorings, and
we can march on ahead!