That's a good point. This is keeping the original logic, but perhaps it should have been looping too, although my guess is that in most cases a multi-step edit would cause the code hints to reset anyway. I'm a bit loath to change this here since it's not quite as obvious as the ScopeManager case - maybe we should file a separate bug on it and have @RaymondLim take a look.