Make it so it builds with Scala 2.11.0-M6.

This involves only one code change, which seems to be related to a scala bug.
https://issues.scala-lang.org/browse/SI-7688