Import matches_subtypes into top level
visitor tweak