Initial work towards Scala 2.10 compliance.