Improved the <a>-<dfn> pairing, but not fully working yet...