Simplified the Uri class a tiny bit.