Yes, now that triggerUntil is gone, both methods can be merged.