Keep vars_ok set so we can skip vars not found instead of crashing/asserting.
Tweak ranges.