env: cleanups

Some drive by cleanups.
Nice.