Adapted AExp analysis to use variableValues instead of strings