mostly fix locals when step-in/out