Fix golint errors.

(Thanks @codahale for pointing them out)