Improve ELEMENT_OPERATORS comment.

Make there be one consistent syntax for element operators.
Refactor a test to remove magic numbers
Pass Matcher to Sorter constructor