exterminated references to older Scala release
more in-situ patching