Auto merge of #160889 - nnethercote:simplify-MaybeBorrowedLocals, r=cjgillot