Issue #5 - Improving closing of special, link, etc.  Making parsing more
explicit.