Continue to progress on type matcher syntax support based on macro.