Heed most of golint's notes