Can we also squash `wait-version` and `end`?