Always return URIs instead of strings

Standardize on URI over URL.