DS-1563:  Refactor UriMutator for clarity and cull some redundant code; ...

... more could be done