Factored tuner state machine a bit more robust.