Changes to build with Scala 2.10.