Correcting editorial errors in examples

A few commas missing, no braces on the JSON object in the identity assertion, unfixed merge conflicts, that sort of thing.