Improve admonition handling