I've reverted the `ComparisonMatcher` changes (locally).

For `validating_something_in_context`, I still need to pick some sort of validation (i.e. presence vs numericality vs whatever) for the model, even though the specific one doesn't matter (as long as it supports `:on`). Should I just use numericality, or should I add a whole bunch of them?