Updated to build with Scala 2.10.3.