All Scala code and tests rewritten in Java6 code. All builds well under JDK8.