Update strings proxy variable map to be context independent (#5377)