Moving to Scala 2.10