Fixed sub-sup tokens format. Closes #21