Fix a bunch of issues from review, including use ClassLoader.getSystemClassloader() vs. Thread.currentThread.getContextClassloader(), plus some naming nits.