Initial re-working of EncounterAndObsDataSetDefinition/Evaluator to leverage and standardize on the approach of EncounterQuery row filters and EncounterData column definitions.