Let's push this URI parsing up into the helper.