Provide support for null in typed URI.

Get stuff working with new blueprints query interfaces.
Merge remote-tracking branch 'origin/master'