Using parse_parens, parse_braces, parse_brackets instead of macros.

Using parse_parens, parse_braces, parse_brackets instead of macros. #3571