TypeSafeReportingMatcher fixes