Updated for Scala 2.10
+ removed a rogue bit of Java