Correct fix for broken ()/[] and balancing fixes