Update contact email address
Emit empty begin nodes correctly

These will not be produced by the parser gem. But I found them useful for
tool development.