Update for new `Alternative` and `Lazy`