Extract BinaryOperator into its own file.
Refactor BinaryOperator.
Refactor Match and MatchSpec.