Changed handling of local variables on stack