env: cleanups

Some drive by cleanups.
Nice. We'll fix that.