More changes to enumerable traverser