Changes for new URI parser.