environmentsetup: small cleanups