Return value of modify_build_environment is unimportant
Iterate over these directly rather than mapping first