Avoid <caption>s inside <caption>s, and update the standalone document.

Fixes #32, fixes #30