More bracket handling fixes.