Consider using the take_mut crate to remove Option<State>

[MarcelGarus]

In several places, we use something like this:

Option<State> // only None during state transitions

Apparently, the take_mut package allows temporarily taking ownership from a &mut.