Clean up macros to handle html tags.