Syntax and gofmt fixes.