Remove use of 'class' in matcher syntax