Updated for Scala 2.10.2 and such.