adjust generated Scala to make it work with scalac -old-syntax and -new-syntax, although the latter is not regularly tested;