Don't clear out newModelValue or newOptions prematurely