More fixups to paren matching