* Extracted sub-matchers for the two major existing strategies (matching all errors, and matching by type and/or message) * Reduced the use of mutable state
* Extracted sub-matchers for the two major existing strategies (matching all errors, and matching by type and/or message) * Reduced the use of mutable state