Changes to build with Scala 2.10.

I guess you might want to tag the current head as "for 2.9.2".