#2586 use enum to track variable location instead of string

#2586 use enum to track variable location instead of string #2339