Consolidate environment var shuffling