added angle brackets to delimiters accepted in matchpairs