Fix bug exposed by the change in Uri without value behavior.