Minor tidy of error checking after running errcheck utility