Moving to Scala 2.10, API changes to follow.