This can probably get closed. I think I forgot to create a topic branch for the feature. The function works well though.
-AK
Anthony, I'll merge it later. There was a bit of confusion who's in
charge of that. 
Robin
Anthony,
I've twekaed the URI struct a bit while merging, can you take a look
and see if that works for you?
I've also added a regression test. If you can think of further cases
to add in there, let me know.
Robin
That looks perfect. Thanks, Robin.
-AK