Move to latest Scala and Kiama