Add rudimentary support for sub/sup/underline.
Clean up.