Tighten up some type arguments to functions. Where we expect a
scope, pass a scope.
Reformat some odd formattings.
Remove odd use of this.