Fix ARM generator to work with new Environment code