Refactor Comparison and Binary operators

Directly produce parsers instead of using a regex and then parse again.
@nremond WDYT?