Refactor -#submatcher_allowed_types and -#submatcher_comparison_descriptions