Make the code 'go vet clear' for some definition of clear.

The warning about composite literal is annoying, so I shut it off