Um, yeah. I think they should always be the same as the originals, but using uri. is more correct certainly. Note that code above just remove @, rather than using uri, though.