Upgrade bracket matcher to use new apis

It was really noisy with deprecations