Long-lived until* scripts simplified