r10882: fix delimited-to-string and parse-uri to correspond to franz' code