fix "composite literal uses unkeyed fields"

Changed the struct literals to use named fields, which lets go vet pass.