Scala 2.11 migration.  Quite simple.