Structured passkeys; changes following code review; major rewrite of options.