Fix issue where multiple expectations for the same method call, with different argument matchers, could not both be satisfied.
Remove old expectation overriding code that was commented out in previous commit.