Re #1244 Improving URI recognition.