Fixups to some conditional bracket closings