Deterministic alternative choice

@erwaller could you look this over?
Let's just kill all the `_whiplash` related code