make Scalastyle less picky about parameter count

otherwise it barfs on Syntax, as well it should I suppose
reformat Syntaxes.scala to get past Scalastyle
minor cleanup