Making a dent in golint: 94 -> 70