Cleanup and a convenience type for Matchers