Added better URI splitting/combining.