Better yet @andrewor14 I could change `populateHadoopClasspath` to avoid a _side effect_ and return the new `env`. I don't see any consumer of `populateHadoopClasspath` outside the `ClientBase`.