Cool, thanks :) I'd be happier knowing that `oneshot` is in a better state, so I think I'll make the change in this PR if that is alright.