Done.  I wanted to give all of those short-lived variables a much smaller scope, but I don't know how to do that in Scala.