To placate CLIRR, changed visibility of inner classes of package private classes from public to package private