Clean up a bunch of golint warnings.