Further improvements to bracket handling.