Better URI logic.