Update scope_exit from master.