put CollectBracketsVisitor back (see #1095)