Cleaning up some of golint's complaints.