Simplifications from `gofmt -s`

I didn't know gofmt -s existed. What do you think @nick.thomas , yay or nay?

@jacobvosmaer-gitlab the changes themselves LGTM. Do we want to change make verify so that the pipeline fails if there are outstanding gofmt -s changes to make?

That sounds reasonable. We have a little one liner buried in make test; we would have to expand on it a bit.

We might also want to skip over the vendor/ directory in make verify.

Closing because stalled.

closed