Various work on indenting Scala.

What a fiddly language.