env: cleanups

Some drive by cleanups.
I like this! Cuts out that one line.
Why %q over %v though?