A bunch of golint fixes.