Add angle brackets to matchpairs