Added more CharMatcher goodness