Better handling of some more character styles