Merging in @freenerd's URI support stuff, looks good...