Fix for r109720: replace the last two regexes with plain string functions. The regula...

Fix for r109720: replace the last two regexes with plain string functions. The regular expression used for stripping the last path component from the output was inefficient, because PCRE does not optimise "$" anchors correctly. It scans the entire string forwards, instead of scanning backwards starting from the anchor. Passes tests.