86 - Changed handling of locals to support non-string vars