Remove separate CharMatch class

move that code into Character rule