Updated URI character use as discussed with Toshiaki.