Add new-style brackets to parser and tests