Finish upgrading to Nimble matcher syntax