[fold] cleanup
[fold] Force lvalue references in PathCursor