Apply go vet findings
Finally yielded and ran 'go fmt' on everything. Turns out (now at least) that it didn't screw up the large comment blocks, which is why I had held off.