Use bold/italic/strike classes more consistently