Supporting queries for OR-statements, and redefining AndClause to be a
map from variable names to Conditions (which, for now, can be either
EQUAL or NOT_EQUAL)