Up to and spiff-destructuring done