Better URI handling in Source and Type classes.