More path-tokenizing