Attached, a patch that refactors the SipURI class, leading to less duplicated code.
Hope this helps, Tom.