CRM-14383 - Update additional script closures