Added IRI to makefile.ttl prereqs.
Simplify definition of methods that delegate to URI.
Added delegation tests.