Improve paths handling on remaining occurrences.