[Reviewer: Mike] Don't allocate the Path URI twice

Mike, please can you review?  This fix is basically as discussed: we parse the Path URI twice - we can just do it once.  I've run UT.