Fix up golint identified errors.