Improve handling of emphasis with word boundaries