Modified to build with Scala 2.10.1.