More work on getting path iterators working right