Merge "Canonicalize path before scanning."