Re-organisation to make options better for navigator.id.watch() [no code change]
Add support for the various navigator.id.request() params