golint tidyups.