Like collapse, this clause has only mild changes that need to be made. Most of the associated work for the RAII container was already done previously, so this is mostly just updating the diagnostics to properly emit the right construct.
