Add a new FIXME which implies ticket #11.
Add a comment about markup style, remove the associated FIXME, and update the markup accordingly.  This closes #8 and #11.