Add env subsumption (but don't use it yet)