Simplify the way dirs are passed through env