Fixes #2:  URI Function is now ValueFunction, and sourceType determined ...

...at the top level.